Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 13:22:55 +0000 (16:22 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 13:22:55 +0000 (16:22 +0300)
commit67a41355b3bdc0f196a5587f804f316594f6eb62
tree30528901b7ad891f88682082b2525e5f3476807d
parent2e3fea72140d9e0c64ceecb73c2df6bca1b1986e
parent5da9741151c2f117c7026ff6d397a133d7e76ff2
Merge from trunk.